From 874d4ede6709b215998715590412770219fe9fba Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Thu, 21 Apr 2016 16:43:35 +0200 Subject: [PATCH] Adwaita: solid bg for disabled pushed button --- gtk/theme/Adwaita/_drawing.scss | 12 +++---- gtk/theme/Adwaita/gtk-contained-dark.css | 37 +++++++++++--------- gtk/theme/Adwaita/gtk-contained.css | 43 +++++++++++++----------- 3 files changed, 50 insertions(+), 42 deletions(-) diff --git a/gtk/theme/Adwaita/_drawing.scss b/gtk/theme/Adwaita/_drawing.scss index 7491737840..5b9920faf6 100644 --- a/gtk/theme/Adwaita/_drawing.scss +++ b/gtk/theme/Adwaita/_drawing.scss @@ -276,8 +276,7 @@ outline-color: transparentize($tc, 0.7); border-color: if($c!=$bg_color, _border_color($c), $borders_color); background-image: none; - @if $variant == 'light' { background-color: darken($c, 8%); } - @else { background-color: darken($c, 6%); } + background-color: if($variant == 'light', darken($c, 8%), darken($c, 6%)); @include _shadows(inset 0 1px transparentize($_hilight_color, 1), $_button_edge); @@ -306,14 +305,14 @@ // // insensitive pushed button // - $_bg: if($c!=$bg_color, darken(mix($c,$base_color, 85%), 5%), - $insensitive_bg_color); + $_bg: if($variant == 'light', darken(mix($c, $base_color, 85%), 8%), darken(mix($c, $base_color, 85%), 6%)); $_bc: if($c!=$bg_color, _border_color($c), $insensitive_borders_color); label, & { color: if($c!=$bg_color, mix($tc, $_bg, 60%), $insensitive_fg_color); } border-color: $_bc; - background-image: linear-gradient(to bottom, mix($_bc, $_bg, 10%), $_bg); + background-color: $_bg; + background-image: none; // white with 0 alpha to avoid an ugly transition, since no color means // black with 0 alpha @include _shadows(inset 0 1px transparentize(white, 1), $_button_edge); @@ -379,8 +378,7 @@ // backdrop insensitive pushed button // - $_bg: if($c!=$bg_color, darken(mix($c, $base_color, 85%), 5%), - darken($insensitive_bg_color, 5%)); + $_bg: if($variant == 'light', darken(mix($c, $base_color, 85%), 8%), darken(mix($c, $base_color, 85%), 6%)); $_bc: if($variant=='light', $_bg,_border_color($c)); label { color: if($c!=$bg_color, mix($tc, $_bg, 35%), $backdrop_insensitive_color); } diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index be8f16df3e..ac635de7ae 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -532,7 +532,7 @@ button { button:backdrop:disabled:active, button:backdrop:disabled:checked { border-color: #262929; - background-color: #272929; + background-color: #282c2c; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } notebook > header > tabs > arrow:backdrop:disabled:active label, button.sidebar-button:backdrop:disabled:active label, button.titlebutton:backdrop:disabled:active label, notebook > header > tabs > arrow:backdrop:disabled:checked label, button.sidebar-button:backdrop:disabled:checked label, button.titlebutton:backdrop:disabled:checked label, notebook > header > tabs > arrow:backdrop:disabled:active label, button.titlebutton:backdrop:disabled:active label, notebook > header > tabs > arrow:backdrop:disabled:checked label, button.titlebutton:backdrop:disabled:checked label, @@ -567,7 +567,8 @@ button { button:disabled:active, button:disabled:checked { border-color: #212424; - background-image: linear-gradient(to bottom, #313434, #333636); + background-color: #282c2c; + background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } notebook > header > tabs > arrow:disabled:active label, button.titlebutton:disabled:active label, notebook > header > tabs > arrow:disabled:active, button.titlebutton:disabled:active, notebook > header > tabs > arrow:disabled:checked label, button.titlebutton:disabled:checked label, notebook > header > tabs > arrow:disabled:checked, button.titlebutton:disabled:checked, button:disabled:active label, @@ -874,7 +875,7 @@ button.suggested-action { button.suggested-action.flat:backdrop:disabled:active, button.suggested-action.flat:backdrop:disabled:checked { border-color: #0f2b48; - background-color: #1d4877; + background-color: #1c4672; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } .selection-mode button.titlebutton:backdrop:disabled:active label, .selection-mode button.titlebutton:backdrop:disabled:checked label, @@ -882,7 +883,7 @@ button.suggested-action { button.suggested-action:backdrop:disabled:checked label, button.suggested-action.flat:backdrop:disabled:active label, button.suggested-action.flat:backdrop:disabled:checked label { - color: #6c88a7; } + color: #6b87a3; } .selection-mode button.titlebutton:backdrop, .selection-mode button.titlebutton:disabled, .selection-mode button.titlebutton:backdrop:disabled, button.suggested-action.flat:backdrop, button.suggested-action.flat:disabled, @@ -907,13 +908,14 @@ button.suggested-action { button.suggested-action:disabled:active, button.suggested-action:disabled:checked { border-color: #0f2b48; - background-image: linear-gradient(to bottom, #1c4572, #1d4877); + background-color: #1c4672; + background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } button.suggested-action:disabled:active label, button.suggested-action:disabled:active, button.suggested-action:disabled:checked label, button.suggested-action:disabled:checked { - color: #a5b6c9; } + color: #a4b5c7; } .osd button.suggested-action { color: #eeeeec; @@ -1055,14 +1057,14 @@ button.destructive-action { button.destructive-action.flat:backdrop:disabled:active, button.destructive-action.flat:backdrop:disabled:checked { border-color: #760909; - background-color: #a41212; + background-color: #9f1111; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } button.destructive-action:backdrop:disabled:active label, button.destructive-action:backdrop:disabled:checked label, button.destructive-action.flat:backdrop:disabled:active label, button.destructive-action.flat:backdrop:disabled:checked label { - color: #c46565; } + color: #c16464; } button.destructive-action.flat:backdrop, button.destructive-action.flat:disabled, button.destructive-action.flat:backdrop:disabled { @@ -1086,13 +1088,14 @@ button.destructive-action { button.destructive-action:disabled:active, button.destructive-action:disabled:checked { border-color: #760909; - background-image: linear-gradient(to bottom, #9f1111, #a41212); + background-color: #9f1111; + background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } button.destructive-action:disabled:active label, button.destructive-action:disabled:active, button.destructive-action:disabled:checked label, button.destructive-action:disabled:checked { - color: #dba0a0; } + color: #d9a0a0; } .osd button.destructive-action { color: #eeeeec; @@ -1247,7 +1250,8 @@ button.needs-attention > image, stacksidebar row.needs-attention > label { color: #949796; } .inline-toolbar toolbutton > button:disabled:active, .inline-toolbar toolbutton > button:disabled:checked { border-color: #212424; - background-image: linear-gradient(to bottom, #313434, #333636); + background-color: #282c2c; + background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } .inline-toolbar toolbutton > button:disabled:active label, .inline-toolbar toolbutton > button:disabled:active, .inline-toolbar toolbutton > button:disabled:checked label, .inline-toolbar toolbutton > button:disabled:checked { color: #949796; } @@ -1278,7 +1282,7 @@ button.needs-attention > image, stacksidebar row.needs-attention > label { color: #5d6767; } .inline-toolbar toolbutton > button:backdrop:disabled:active, .inline-toolbar toolbutton > button:backdrop:disabled:checked { border-color: #262929; - background-color: #272929; + background-color: #282c2c; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } .inline-toolbar toolbutton > button:backdrop:disabled:active label, .inline-toolbar toolbutton > button:backdrop:disabled:checked label { @@ -1897,7 +1901,7 @@ headerbar { headerbar.selection-mode button:backdrop:disabled:active, headerbar.selection-mode button:backdrop:disabled:checked { border-color: #0f2b48; - background-color: #1d4877; + background-color: #1c4672; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #0f2b48; } @@ -1906,7 +1910,7 @@ headerbar { headerbar.selection-mode button:backdrop.flat:disabled:checked label, headerbar.selection-mode button:backdrop:disabled:active label, headerbar.selection-mode button:backdrop:disabled:checked label { - color: #6c88a7; } + color: #6b87a3; } .selection-mode.titlebar:not(headerbar) button.flat:backdrop, .selection-mode.titlebar:not(headerbar) button.flat:disabled, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled, headerbar.selection-mode button.flat:backdrop, headerbar.selection-mode button.flat:disabled, @@ -1933,14 +1937,15 @@ headerbar { headerbar.selection-mode button:disabled:active, headerbar.selection-mode button:disabled:checked { border-color: #0f2b48; - background-image: linear-gradient(to bottom, #1c4572, #1d4877); + background-color: #1c4672; + background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } .selection-mode.titlebar:not(headerbar) button:disabled:active label, .selection-mode.titlebar:not(headerbar) button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:checked label, .selection-mode.titlebar:not(headerbar) button:disabled:checked, headerbar.selection-mode button:disabled:active label, headerbar.selection-mode button:disabled:active, headerbar.selection-mode button:disabled:checked label, headerbar.selection-mode button:disabled:checked { - color: #a5b6c9; } + color: #a4b5c7; } .selection-mode.titlebar:not(headerbar) button.suggested-action, headerbar.selection-mode button.suggested-action { color: #eeeeec; diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 70730b366a..1a71b4d5cb 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -532,7 +532,7 @@ button { button:backdrop:disabled:active, button:backdrop:disabled:checked { border-color: #c0c0bd; - background-color: #e4e4e4; + background-color: #d7d7d7; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } notebook > header > tabs > arrow:backdrop:disabled:active label, button.sidebar-button:backdrop:disabled:active label, button.titlebutton:backdrop:disabled:active label, notebook > header > tabs > arrow:backdrop:disabled:checked label, button.sidebar-button:backdrop:disabled:checked label, button.titlebutton:backdrop:disabled:checked label, notebook > header > tabs > arrow:backdrop:disabled:active label, button.titlebutton:backdrop:disabled:active label, notebook > header > tabs > arrow:backdrop:disabled:checked label, button.titlebutton:backdrop:disabled:checked label, @@ -567,7 +567,8 @@ button { button:disabled:active, button:disabled:checked { border-color: #b6b6b3; - background-image: linear-gradient(to bottom, #ebebeb, #f1f1f1); + background-color: #d7d7d7; + background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } notebook > header > tabs > arrow:disabled:active label, button.titlebutton:disabled:active label, notebook > header > tabs > arrow:disabled:active, button.titlebutton:disabled:active, notebook > header > tabs > arrow:disabled:checked label, button.titlebutton:disabled:checked label, notebook > header > tabs > arrow:disabled:checked, button.titlebutton:disabled:checked, button:disabled:active label, @@ -876,8 +877,8 @@ button.suggested-action { button.suggested-action:backdrop:disabled:checked, button.suggested-action.flat:backdrop:disabled:active, button.suggested-action.flat:backdrop:disabled:checked { - border-color: #5094db; - background-color: #5094db; + border-color: #438cd8; + background-color: #438cd8; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } .selection-mode button.titlebutton:backdrop:disabled:active label, .selection-mode button.titlebutton:backdrop:disabled:checked label, @@ -885,7 +886,7 @@ button.suggested-action { button.suggested-action:backdrop:disabled:checked label, button.suggested-action.flat:backdrop:disabled:active label, button.suggested-action.flat:backdrop:disabled:checked label { - color: #8db9e8; } + color: #85b4e6; } .selection-mode button.titlebutton:backdrop, .selection-mode button.titlebutton:disabled, .selection-mode button.titlebutton:backdrop:disabled, button.suggested-action.flat:backdrop, button.suggested-action.flat:disabled, @@ -910,13 +911,14 @@ button.suggested-action { button.suggested-action:disabled:active, button.suggested-action:disabled:checked { border-color: #215d9c; - background-image: linear-gradient(to bottom, #4b8fd5, #5094db); + background-color: #438cd8; + background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } button.suggested-action:disabled:active label, button.suggested-action:disabled:active, button.suggested-action:disabled:checked label, button.suggested-action:disabled:checked { - color: #b9d4f1; } + color: #b4d1ef; } .osd button.suggested-action { color: #eeeeec; @@ -1057,15 +1059,15 @@ button.destructive-action { button.destructive-action:backdrop:disabled:checked, button.destructive-action.flat:backdrop:disabled:active, button.destructive-action.flat:backdrop:disabled:checked { - border-color: #ef3131; - background-color: #ef3131; + border-color: #ee2323; + background-color: #ee2323; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } button.destructive-action:backdrop:disabled:active label, button.destructive-action:backdrop:disabled:checked label, button.destructive-action.flat:backdrop:disabled:active label, button.destructive-action.flat:backdrop:disabled:checked label { - color: #f57979; } + color: #f47070; } button.destructive-action.flat:backdrop, button.destructive-action.flat:disabled, button.destructive-action.flat:backdrop:disabled { @@ -1089,13 +1091,14 @@ button.destructive-action { button.destructive-action:disabled:active, button.destructive-action:disabled:checked { border-color: #a60c0c; - background-image: linear-gradient(to bottom, #e82d2d, #ef3131); + background-color: #ee2323; + background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } button.destructive-action:disabled:active label, button.destructive-action:disabled:active, button.destructive-action:disabled:checked label, button.destructive-action:disabled:checked { - color: #f9adad; } + color: #f8a7a7; } .osd button.destructive-action { color: #eeeeec; @@ -1250,7 +1253,8 @@ button.needs-attention > image, stacksidebar row.needs-attention > label { color: #8b8e8f; } .inline-toolbar toolbutton > button:disabled:active, .inline-toolbar toolbutton > button:disabled:checked { border-color: #b6b6b3; - background-image: linear-gradient(to bottom, #ebebeb, #f1f1f1); + background-color: #d7d7d7; + background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } .inline-toolbar toolbutton > button:disabled:active label, .inline-toolbar toolbutton > button:disabled:active, .inline-toolbar toolbutton > button:disabled:checked label, .inline-toolbar toolbutton > button:disabled:checked { color: #8b8e8f; } @@ -1281,7 +1285,7 @@ button.needs-attention > image, stacksidebar row.needs-attention > label { color: #c3c3c0; } .inline-toolbar toolbutton > button:backdrop:disabled:active, .inline-toolbar toolbutton > button:backdrop:disabled:checked { border-color: #c0c0bd; - background-color: #e4e4e4; + background-color: #d7d7d7; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } .inline-toolbar toolbutton > button:backdrop:disabled:active label, .inline-toolbar toolbutton > button:backdrop:disabled:checked label { @@ -1903,8 +1907,8 @@ headerbar { headerbar.selection-mode button:backdrop.flat:disabled:checked, headerbar.selection-mode button:backdrop:disabled:active, headerbar.selection-mode button:backdrop:disabled:checked { - border-color: #5094db; - background-color: #5094db; + border-color: #438cd8; + background-color: #438cd8; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); border-color: #184472; } @@ -1913,7 +1917,7 @@ headerbar { headerbar.selection-mode button:backdrop.flat:disabled:checked label, headerbar.selection-mode button:backdrop:disabled:active label, headerbar.selection-mode button:backdrop:disabled:checked label { - color: #8db9e8; } + color: #85b4e6; } .selection-mode.titlebar:not(headerbar) button.flat:backdrop, .selection-mode.titlebar:not(headerbar) button.flat:disabled, .selection-mode.titlebar:not(headerbar) button.flat:backdrop:disabled, headerbar.selection-mode button.flat:backdrop, headerbar.selection-mode button.flat:disabled, @@ -1940,14 +1944,15 @@ headerbar { headerbar.selection-mode button:disabled:active, headerbar.selection-mode button:disabled:checked { border-color: #215d9c; - background-image: linear-gradient(to bottom, #4b8fd5, #5094db); + background-color: #438cd8; + background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); } .selection-mode.titlebar:not(headerbar) button:disabled:active label, .selection-mode.titlebar:not(headerbar) button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:checked label, .selection-mode.titlebar:not(headerbar) button:disabled:checked, headerbar.selection-mode button:disabled:active label, headerbar.selection-mode button:disabled:active, headerbar.selection-mode button:disabled:checked label, headerbar.selection-mode button:disabled:checked { - color: #b9d4f1; } + color: #b4d1ef; } .selection-mode.titlebar:not(headerbar) button.suggested-action, headerbar.selection-mode button.suggested-action { color: #2e3436; -- 2.30.2